From d2a577d797060e1a8fa52014e8419ec3528ad53a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 22 Sep 2017 22:52:23 +0800 Subject: [PATCH] HighContrast: set min-height for headerbars https://bugzilla.gnome.org/show_bug.cgi?id=784562 --- gtk/theme/HighContrast/_common.scss | 13 +++++++++++++ gtk/theme/HighContrast/gtk-contained-inverse.css | 6 +++++- gtk/theme/HighContrast/gtk-contained.css | 6 +++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index 7d42945f63..abc820c7b5 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -1181,6 +1181,7 @@ searchbar { .titlebar, headerbar { + min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: $borders_color; @@ -1250,6 +1251,18 @@ headerbar { .fullscreen & { border-radius: 0; } + + &.default-decoration { + min-height: 28px; + padding: 4px; + + button.titlebutton { + min-height: 26px; + min-width: 26px; + margin: 0; + padding: 0; + } + } } /************ diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 87f5427fb1..fd3fc86e0d 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -482,7 +482,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar { border-style: solid; border-c toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-color: #737373; background-color: #282828; box-shadow: none; } /*************** Header bars * */ -.titlebar, headerbar { border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, #0a0a0a, #000); box-shadow: inset 0 -1px #262626, inset 0 1px #000; padding: 6px; } +.titlebar, headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, #0a0a0a, #000); box-shadow: inset 0 -1px #262626, inset 0 1px #000; padding: 6px; } .titlebar:backdrop, headerbar:backdrop { border-color: #737373; background-color: #000; background-image: none; box-shadow: none; } @@ -520,6 +520,10 @@ toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-colo .tiled .titlebar, .maximized .titlebar, .fullscreen .titlebar, .tiled headerbar, .maximized headerbar, .fullscreen headerbar { border-radius: 0; } +.titlebar.default-decoration, headerbar.default-decoration { min-height: 28px; padding: 4px; } + +.titlebar.default-decoration button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + /************ Pathbars * */ .path-bar button { padding: 5px 6px 6px; } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index 9a438bb964..7b06e46035 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -486,7 +486,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar { border-style: solid; border-c toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-color: #8d8d8d; background-color: #d7d7d7; box-shadow: none; } /*************** Header bars * */ -.titlebar, headerbar { border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, white, #fff); box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff; padding: 6px; } +.titlebar, headerbar { min-height: 46px; border-width: 0 0 1px; border-style: solid; border-color: gray; border-radius: 7px 7px 0 0; background-color: transparent; background-image: linear-gradient(to bottom, white, #fff); box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff; padding: 6px; } .titlebar:backdrop, headerbar:backdrop { border-color: #8d8d8d; background-color: #fff; background-image: none; box-shadow: none; } @@ -524,6 +524,10 @@ toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop { border-colo .tiled .titlebar, .maximized .titlebar, .fullscreen .titlebar, .tiled headerbar, .maximized headerbar, .fullscreen headerbar { border-radius: 0; } +.titlebar.default-decoration, headerbar.default-decoration { min-height: 28px; padding: 4px; } + +.titlebar.default-decoration button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + /************ Pathbars * */ .path-bar button { padding: 5px 6px 6px; } -- 2.30.2